From 31ce86457aefaffe2c820fb46c17f98c4dea1b9a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 1 Nov 2003 17:35:23 +0000 Subject: [PATCH] (rx-or): Fix the case of "(rx (and ?a (or ?b ?c) ?d))". --- lisp/emacs-lisp/rx.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 8e38aed10d2..bc16a84b156 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -286,9 +286,11 @@ FORM is of the form `(and FORM1 ...)'." (dolist (arg (cdr form)) (unless (stringp arg) (setq all-args-strings nil))) - (if all-args-strings - (regexp-opt (cdr form)) - (mapconcat #'rx-to-string (cdr form) "\\|")))) + (concat "\\(?:" + (if all-args-strings + (regexp-opt (cdr form)) + (mapconcat #'rx-to-string (cdr form) "\\|")) + "\\)"))) (defun rx-quote-for-set (string) -- 2.30.2